Autogenerated HTML docs for v1.9.1-506-g7bf27
diff --git a/RelNotes/1.9.2.txt b/RelNotes/1.9.2.txt index c755e34..35904d0 100644 --- a/RelNotes/1.9.2.txt +++ b/RelNotes/1.9.2.txt
@@ -4,6 +4,15 @@ Fixes since v1.9.1 ------------------ + * When it is not necessary to edit a commit log message (e.g. "git + commit -m" is given a message without specifying "-e"), we used to + disable the spawning of the editor by overriding GIT_EDITOR, but + this means all the uses of the editor, other than to edit the + commit log message, are also affected. + + * "git status --porcelain --branch" showed its output with labels + "ahead/behind/gone" translated to the user's locale. + * "git mv" that moves a submodule forgot to adjust the array that uses to keep track of which submodules were to be moved to update its configuration.
diff --git a/RelNotes/2.0.0.txt b/RelNotes/2.0.0.txt index 1058f7d..9e06b7d 100644 --- a/RelNotes/2.0.0.txt +++ b/RelNotes/2.0.0.txt
@@ -136,7 +136,8 @@ Performance, Internal Implementation, etc. - * The compilation options to port to AIX has been updated. + * The compilation options to port to AIX and to MSVC have been + updated. * We started using wildmatch() in place of fnmatch(3) a few releases ago; complete the process and stop using fnmatch(3). @@ -170,6 +171,10 @@ track are contained in this release (see the maintenance releases' notes for details). + * "git update-ref --stdin" did not fail a request to create a ref + when the ref already existed. + (merge b9d56b5 mh/update-ref-batch-create-fix later to maint). + * "git diff --no-index -Mq a b" fell into an infinite loop. (merge ad1c3fb jc/fix-diff-no-index-diff-opt-parse later to maint). @@ -190,23 +195,9 @@ "ahead/behind/gone" translated to the user's locale. (merge 7a76c28 mm/status-porcelain-format-i18n-fix later to maint). - - * "git repack" died when asked to (re)pack with the reachability - bitmap when a bitmap cannot be built; instead, just (re)pack - without producing a bitmap in such a case, with a warning. - (merge 373c67d jk/pack-bitmap later to maint). - - - * The progress output while repacking and transferring objects showed - an apparent large silence while writing the objects out of existing - packfiles, when the reachability bitmap was in use. - (merge 78d2214 jk/pack-bitmap-progress later to maint). - - * A stray environment variable $prefix could have leaked into and affected the behaviour of the "subtree" script (in contrib/). - * When it is not necessary to edit a commit log message (e.g. "git commit -m" is given a message without specifying "-e"), we used to disable the spawning of the editor by overriding GIT_EDITOR, but @@ -214,7 +205,6 @@ commit log message, are also affected. (merge b549be0 bp/commit-p-editor later to maint). - * "git mv" that moves a submodule forgot to adjust the array that uses to keep track of which submodules were to be moved to update its configuration. @@ -274,7 +264,7 @@ * Codepaths that parse timestamps in commit objects have been tightened. - (merge 3f419d4 jk/commit-dates-parsing-fix later to maint). + (merge f80d1f9 jk/commit-dates-parsing-fix later to maint). * "git diff --external-diff" incorrectly fed the submodule directory in the working tree to the external diff driver when it knew it is @@ -329,3 +319,7 @@ extra and unnecessary trailing slash (such a slash is often given by command line completion). (merge 2e70c01 nd/submodule-pathspec-ending-with-slash later to maint.) + + * Documentation and in-code comments had many instances of mistaken + use of "nor", which have been corrected. + (merge 235e8d5 jl/nor-or-nand-and later to maint).
diff --git a/config.txt b/config.txt index 84c7e3f..d8b6cc9 100644 --- a/config.txt +++ b/config.txt
@@ -78,8 +78,8 @@ The following escape sequences (beside `\"` and `\\`) are recognized: `\n` for newline character (NL), `\t` for horizontal tabulation (HT, TAB) -and `\b` for backspace (BS). No other char escape sequence, nor octal -char sequences are valid. +and `\b` for backspace (BS). Other char escape sequences (including octal +escape sequences) are invalid. Variable values ending in a `\` are continued on the next line in the customary UNIX fashion. @@ -826,7 +826,7 @@ commands will only use color when output is to the terminal. Defaults to false. + -This does not affect linkgit:git-format-patch[1] nor the +This does not affect linkgit:git-format-patch[1] or the 'git-diff-{asterisk}' plumbing commands. Can be overridden on the command line with the `--color[=<when>]` option. diff --git a/diff-generate-patch.txt b/diff-generate-patch.txt index 55f499a..843a20b 100644 --- a/diff-generate-patch.txt +++ b/diff-generate-patch.txt
@@ -174,7 +174,7 @@ In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear -in either file1 nor file2). Also eight other lines are the same +in either file1 or file2). Also eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`). When shown by `git diff-tree -c`, it compares the parents of a
diff --git a/diff-options.txt b/diff-options.txt index 9b37b2a..6cb083a 100644 --- a/diff-options.txt +++ b/diff-options.txt
@@ -358,7 +358,7 @@ --irreversible-delete:: Omit the preimage for deletes, i.e. print only the header but not the diff between the preimage and `/dev/null`. The resulting patch - is not meant to be applied with `patch` nor `git apply`; this is + is not meant to be applied with `patch` or `git apply`; this is solely for people who want to just concentrate on reviewing the text after the change. In addition, the output obviously lack enough information to apply such a patch in reverse, even manually,
diff --git a/everyday.html b/everyday.html index 8b2370f..79e237c 100644 --- a/everyday.html +++ b/everyday.html
@@ -1227,7 +1227,7 @@ <li> <p> rebase internal topic branch that has not been merged to the -master, nor exposed as a part of a stable branch. +master or exposed as a part of a stable branch. </p> </li> <li> @@ -1473,7 +1473,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-09-17 14:33:14 PDT +Last updated 2014-04-08 12:47:26 PDT </div> </div> </body>
diff --git a/everyday.txt b/everyday.txt index 2a18c1f..b2548ef 100644 --- a/everyday.txt +++ b/everyday.txt
@@ -263,7 +263,7 @@ <5> create topic branch as needed and apply, again with my sign-offs. <6> rebase internal topic branch that has not been merged to the -master, nor exposed as a part of a stable branch. +master or exposed as a part of a stable branch. <7> restart `pu` every time from the next. <8> and bundle topic branches still cooking. <9> backport a critical fix.
diff --git a/git-add.html b/git-add.html index ca47025..9c46bb5 100644 --- a/git-add.html +++ b/git-add.html
@@ -1158,9 +1158,9 @@ <div class="content"> <pre><tt>y - stage this hunk n - do not stage this hunk -q - quit; do not stage this hunk nor any of the remaining ones +q - quit; do not stage this hunk or any of the remaining ones a - stage this hunk and all later hunks in the file -d - do not stage this hunk nor any of the later hunks in the file +d - do not stage this hunk or any of the later hunks in the file g - select a hunk to go to / - search for a hunk matching the given regex j - leave this hunk undecided, see next undecided hunk @@ -1321,7 +1321,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2014-03-11 14:35:07 PDT +Last updated 2014-04-08 12:47:26 PDT </div> </div> </body>
diff --git a/git-add.txt b/git-add.txt index 895922e..9631526 100644 --- a/git-add.txt +++ b/git-add.txt
@@ -300,9 +300,9 @@ y - stage this hunk n - do not stage this hunk - q - quit; do not stage this hunk nor any of the remaining ones + q - quit; do not stage this hunk or any of the remaining ones a - stage this hunk and all later hunks in the file - d - do not stage this hunk nor any of the later hunks in the file + d - do not stage this hunk or any of the later hunks in the file g - select a hunk to go to / - search for a hunk matching the given regex j - leave this hunk undecided, see next undecided hunk
diff --git a/git-cherry-pick.html b/git-cherry-pick.html index 45a14bc..2bcaa81 100644 --- a/git-cherry-pick.html +++ b/git-cherry-pick.html
@@ -751,7 +751,7 @@ <div class="sectionbody"> <div class="verseblock"> <pre class="content"><em>git cherry-pick</em> [--edit] [-n] [-m parent-number] [-s] [-x] [--ff] - [-S[<keyid>]] <commit>… + [-S[<key-id>]] <commit>… <em>git cherry-pick</em> --continue <em>git cherry-pick</em> --quit <em>git cherry-pick</em> --abort</pre> @@ -911,10 +911,10 @@ </p> </dd> <dt class="hdlist1"> --S[<keyid>] +-S[<key-id>] </dt> <dt class="hdlist1"> ---gpg-sign[=<keyid>] +--gpg-sign[=<key-id>] </dt> <dd> <p> @@ -1172,7 +1172,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2014-02-27 15:06:29 PST +Last updated 2014-04-08 12:47:26 PDT </div> </div> </body>
diff --git a/git-cherry-pick.txt b/git-cherry-pick.txt index f1e6b2f..1c03c79 100644 --- a/git-cherry-pick.txt +++ b/git-cherry-pick.txt
@@ -9,7 +9,7 @@ -------- [verse] 'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff] - [-S[<keyid>]] <commit>... + [-S[<key-id>]] <commit>... 'git cherry-pick' --continue 'git cherry-pick' --quit 'git cherry-pick' --abort @@ -101,8 +101,8 @@ --signoff:: Add Signed-off-by line at the end of the commit message. --S[<keyid>]:: ---gpg-sign[=<keyid>]:: +-S[<key-id>]:: +--gpg-sign[=<key-id>]:: GPG-sign commits. --ff::
diff --git a/git-commit.html b/git-commit.html index 7fa1565..b5cc6b2 100644 --- a/git-commit.html +++ b/git-commit.html
@@ -755,7 +755,7 @@ [-F <file> | -m <msg>] [--reset-author] [--allow-empty] [--allow-empty-message] [--no-verify] [-e] [--author=<author>] [--date=<date>] [--cleanup=<mode>] [--[no-]status] - [-i | -o] [-S[<keyid>]] [--] [<file>…]</pre> + [-i | -o] [-S[<key-id>]] [--] [<file>…]</pre> <div class="attribution"> </div></div> </div> @@ -1626,7 +1626,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2014-03-25 12:54:14 PDT +Last updated 2014-04-08 12:47:26 PDT </div> </div> </body>
diff --git a/git-commit.txt b/git-commit.txt index 429267a..0bbc8f5 100644 --- a/git-commit.txt +++ b/git-commit.txt
@@ -13,7 +13,7 @@ [-F <file> | -m <msg>] [--reset-author] [--allow-empty] [--allow-empty-message] [--no-verify] [-e] [--author=<author>] [--date=<date>] [--cleanup=<mode>] [--[no-]status] - [-i | -o] [-S[<keyid>]] [--] [<file>...] + [-i | -o] [-S[<key-id>]] [--] [<file>...] DESCRIPTION -----------
diff --git a/git-config.html b/git-config.html index bda066c..db6205d 100644 --- a/git-config.html +++ b/git-config.html
@@ -1398,8 +1398,8 @@ be escaped: use <tt>\"</tt> for <tt>"</tt> and <tt>\\</tt> for <tt>\</tt>.</p></div> <div class="paragraph"><p>The following escape sequences (beside <tt>\"</tt> and <tt>\\</tt>) are recognized: <tt>\n</tt> for newline character (NL), <tt>\t</tt> for horizontal tabulation (HT, TAB) -and <tt>\b</tt> for backspace (BS). No other char escape sequence, nor octal -char sequences are valid.</p></div> +and <tt>\b</tt> for backspace (BS). Other char escape sequences (including octal +escape sequences) are invalid.</p></div> <div class="paragraph"><p>Variable values ending in a <tt>\</tt> are continued on the next line in the customary UNIX fashion.</p></div> <div class="paragraph"><p>Some variables may require a special value format.</p></div> @@ -2536,7 +2536,7 @@ commands will only use color when output is to the terminal. Defaults to false. </p> -<div class="paragraph"><p>This does not affect <a href="git-format-patch.html">git-format-patch(1)</a> nor the +<div class="paragraph"><p>This does not affect <a href="git-format-patch.html">git-format-patch(1)</a> or the <em>git-diff-*</em> plumbing commands. Can be overridden on the command line with the <tt>--color[=<when>]</tt> option.</p></div> </dd>
diff --git a/git-count-objects.html b/git-count-objects.html index 224ab53..9e14eb3 100644 --- a/git-count-objects.html +++ b/git-count-objects.html
@@ -782,8 +782,8 @@ <div class="paragraph"><p>size-pack: disk space consumed by the packs, in KiB (unless -H is specified)</p></div> <div class="paragraph"><p>prune-packable: the number of loose objects that are also present in the packs. These objects could be pruned using <tt>git prune-packed</tt>.</p></div> -<div class="paragraph"><p>garbage: the number of files in object database that are not valid -loose objects nor valid packs</p></div> +<div class="paragraph"><p>garbage: the number of files in object database that are neither valid loose +objects nor valid packs</p></div> <div class="paragraph"><p>size-garbage: disk space consumed by garbage files, in KiB (unless -H is specified)</p></div> </dd> @@ -811,7 +811,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-08-20 08:40:27 PDT +Last updated 2014-04-08 12:47:26 PDT </div> </div> </body>
diff --git a/git-count-objects.txt b/git-count-objects.txt index b300e84..2ff3568 100644 --- a/git-count-objects.txt +++ b/git-count-objects.txt
@@ -33,8 +33,8 @@ prune-packable: the number of loose objects that are also present in the packs. These objects could be pruned using `git prune-packed`. + -garbage: the number of files in object database that are not valid -loose objects nor valid packs +garbage: the number of files in object database that are neither valid loose +objects nor valid packs + size-garbage: disk space consumed by garbage files, in KiB (unless -H is specified)
diff --git a/git-diff-files.html b/git-diff-files.html index 589a444..f444768 100644 --- a/git-diff-files.html +++ b/git-diff-files.html
@@ -1331,7 +1331,7 @@ <p> Omit the preimage for deletes, i.e. print only the header but not the diff between the preimage and <tt>/dev/null</tt>. The resulting patch - is not meant to be applied with <tt>patch</tt> nor <tt>git apply</tt>; this is + is not meant to be applied with <tt>patch</tt> or <tt>git apply</tt>; this is solely for people who want to just concentrate on reviewing the text after the change. In addition, the output obviously lack enough information to apply such a patch in reverse, even manually, @@ -2118,7 +2118,7 @@ <div class="paragraph"><p>In the above example output, the function signature was changed from both files (hence two <tt>-</tt> removals from both file1 and file2, plus <tt>++</tt> to mean one line that was added does not appear -in either file1 nor file2). Also eight other lines are the same +in either file1 or file2). Also eight other lines are the same from file1 but do not appear in file2 (hence prefixed with <tt>+</tt>).</p></div> <div class="paragraph"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the
diff --git a/git-diff-index.html b/git-diff-index.html index f70e464..bff760a 100644 --- a/git-diff-index.html +++ b/git-diff-index.html
@@ -1332,7 +1332,7 @@ <p> Omit the preimage for deletes, i.e. print only the header but not the diff between the preimage and <tt>/dev/null</tt>. The resulting patch - is not meant to be applied with <tt>patch</tt> nor <tt>git apply</tt>; this is + is not meant to be applied with <tt>patch</tt> or <tt>git apply</tt>; this is solely for people who want to just concentrate on reviewing the text after the change. In addition, the output obviously lack enough information to apply such a patch in reverse, even manually, @@ -2102,7 +2102,7 @@ <div class="paragraph"><p>In the above example output, the function signature was changed from both files (hence two <tt>-</tt> removals from both file1 and file2, plus <tt>++</tt> to mean one line that was added does not appear -in either file1 nor file2). Also eight other lines are the same +in either file1 or file2). Also eight other lines are the same from file1 but do not appear in file2 (hence prefixed with <tt>+</tt>).</p></div> <div class="paragraph"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the
diff --git a/git-diff-tree.html b/git-diff-tree.html index a2d8c9b..d771ac5 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html
@@ -1333,7 +1333,7 @@ <p> Omit the preimage for deletes, i.e. print only the header but not the diff between the preimage and <tt>/dev/null</tt>. The resulting patch - is not meant to be applied with <tt>patch</tt> nor <tt>git apply</tt>; this is + is not meant to be applied with <tt>patch</tt> or <tt>git apply</tt>; this is solely for people who want to just concentrate on reviewing the text after the change. In addition, the output obviously lack enough information to apply such a patch in reverse, even manually, @@ -1802,7 +1802,7 @@ Show the notes (see <a href="git-notes.html">git-notes(1)</a>) that annotate the commit, when showing the commit log message. This is the default for <tt>git log</tt>, <tt>git show</tt> and <tt>git whatchanged</tt> commands when - there is no <tt>--pretty</tt>, <tt>--format</tt> nor <tt>--oneline</tt> option given + there is no <tt>--pretty</tt>, <tt>--format</tt>, or <tt>--oneline</tt> option given on the command line. </p> <div class="paragraph"><p>By default, the notes shown are from the notes refs listed in the @@ -2026,7 +2026,7 @@ stored in the commit object. Notably, the SHA-1s are displayed in full, regardless of whether --abbrev or --no-abbrev are used, and <em>parents</em> information show the -true parent commits, without taking grafts nor history +true parent commits, without taking grafts or history simplification into account.</p></div> </li> <li> @@ -2895,7 +2895,7 @@ <div class="paragraph"><p>In the above example output, the function signature was changed from both files (hence two <tt>-</tt> removals from both file1 and file2, plus <tt>++</tt> to mean one line that was added does not appear -in either file1 nor file2). Also eight other lines are the same +in either file1 or file2). Also eight other lines are the same from file1 but do not appear in file2 (hence prefixed with <tt>+</tt>).</p></div> <div class="paragraph"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the
diff --git a/git-diff.html b/git-diff.html index 6254983..aa87aa3 100644 --- a/git-diff.html +++ b/git-diff.html
@@ -1442,7 +1442,7 @@ <p> Omit the preimage for deletes, i.e. print only the header but not the diff between the preimage and <tt>/dev/null</tt>. The resulting patch - is not meant to be applied with <tt>patch</tt> nor <tt>git apply</tt>; this is + is not meant to be applied with <tt>patch</tt> or <tt>git apply</tt>; this is solely for people who want to just concentrate on reviewing the text after the change. In addition, the output obviously lack enough information to apply such a patch in reverse, even manually, @@ -2195,7 +2195,7 @@ <div class="paragraph"><p>In the above example output, the function signature was changed from both files (hence two <tt>-</tt> removals from both file1 and file2, plus <tt>++</tt> to mean one line that was added does not appear -in either file1 nor file2). Also eight other lines are the same +in either file1 or file2). Also eight other lines are the same from file1 but do not appear in file2 (hence prefixed with <tt>+</tt>).</p></div> <div class="paragraph"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the @@ -2429,8 +2429,8 @@ <div class="colist arabic"><ol> <li> <p> -Show only modification, rename and copy, but not addition -nor deletion. +Show only modification, rename, and copy, but not addition +or deletion. </p> </li> <li> @@ -2493,7 +2493,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2014-02-07 12:30:09 PST +Last updated 2014-04-08 12:47:26 PDT </div> </div> </body>
diff --git a/git-diff.txt b/git-diff.txt index 56fb7e5..bbab35f 100644 --- a/git-diff.txt +++ b/git-diff.txt
@@ -158,8 +158,8 @@ $ git diff arch/i386 include/asm-i386 <3> ------------ + -<1> Show only modification, rename and copy, but not addition -nor deletion. +<1> Show only modification, rename, and copy, but not addition +or deletion. <2> Show only names and the nature of change, but not actual diff output. <3> Limit diff output to named subtrees.
diff --git a/git-format-patch.html b/git-format-patch.html index 4598ee7..94e185d 100644 --- a/git-format-patch.html +++ b/git-format-patch.html
@@ -1189,7 +1189,7 @@ <p> Omit the preimage for deletes, i.e. print only the header but not the diff between the preimage and <tt>/dev/null</tt>. The resulting patch - is not meant to be applied with <tt>patch</tt> nor <tt>git apply</tt>; this is + is not meant to be applied with <tt>patch</tt> or <tt>git apply</tt>; this is solely for people who want to just concentrate on reviewing the text after the change. In addition, the output obviously lack enough information to apply such a patch in reverse, even manually,
diff --git a/git-log.html b/git-log.html index 7be5f1d..f88961f 100644 --- a/git-log.html +++ b/git-log.html
@@ -1317,7 +1317,7 @@ reflog entries from the most recent one to older ones. When this option is used you cannot specify commits to exclude (that is, <em>^commit</em>, <em>commit1..commit2</em>, - nor <em>commit1...commit2</em> notations cannot be used). + and <em>commit1...commit2</em> notations cannot be used). </p> <div class="paragraph"><p>With <tt>--pretty</tt> format other than <tt>oneline</tt> (for obvious reasons), this causes the output to have two extra lines of information @@ -1911,7 +1911,7 @@ Show the notes (see <a href="git-notes.html">git-notes(1)</a>) that annotate the commit, when showing the commit log message. This is the default for <tt>git log</tt>, <tt>git show</tt> and <tt>git whatchanged</tt> commands when - there is no <tt>--pretty</tt>, <tt>--format</tt> nor <tt>--oneline</tt> option given + there is no <tt>--pretty</tt>, <tt>--format</tt>, or <tt>--oneline</tt> option given on the command line. </p> <div class="paragraph"><p>By default, the notes shown are from the notes refs listed in the @@ -2252,7 +2252,7 @@ stored in the commit object. Notably, the SHA-1s are displayed in full, regardless of whether --abbrev or --no-abbrev are used, and <em>parents</em> information show the -true parent commits, without taking grafts nor history +true parent commits, without taking grafts or history simplification into account.</p></div> </li> <li> @@ -3209,7 +3209,7 @@ <p> Omit the preimage for deletes, i.e. print only the header but not the diff between the preimage and <tt>/dev/null</tt>. The resulting patch - is not meant to be applied with <tt>patch</tt> nor <tt>git apply</tt>; this is + is not meant to be applied with <tt>patch</tt> or <tt>git apply</tt>; this is solely for people who want to just concentrate on reviewing the text after the change. In addition, the output obviously lack enough information to apply such a patch in reverse, even manually, @@ -3698,7 +3698,7 @@ <div class="paragraph"><p>In the above example output, the function signature was changed from both files (hence two <tt>-</tt> removals from both file1 and file2, plus <tt>++</tt> to mean one line that was added does not appear -in either file1 nor file2). Also eight other lines are the same +in either file1 or file2). Also eight other lines are the same from file1 but do not appear in file2 (hence prefixed with <tt>+</tt>).</p></div> <div class="paragraph"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the
diff --git a/git-merge.html b/git-merge.html index 0335aa7..e59c604 100644 --- a/git-merge.html +++ b/git-merge.html
@@ -751,7 +751,7 @@ <div class="sectionbody"> <div class="verseblock"> <pre class="content"><em>git merge</em> [-n] [--stat] [--no-commit] [--squash] [--[no-]edit] - [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]] + [-s <strategy>] [-X <strategy-option>] [-S[<key-id>]] [--[no-]rerere-autoupdate] [-m <msg>] [<commit>…] <em>git merge</em> <msg> HEAD <commit>… <em>git merge</em> --abort</pre> @@ -916,14 +916,13 @@ </dt> <dd> <p> - Produce the working tree and index state as if a real - merge happened (except for the merge information), - but do not actually make a commit or - move the <tt>HEAD</tt>, nor record <tt>$GIT_DIR/MERGE_HEAD</tt> to - cause the next <tt>git commit</tt> command to create a merge - commit. This allows you to create a single commit on - top of the current branch whose effect is the same as - merging another branch (or more in case of an octopus). + Produce the working tree and index state as if a real merge + happened (except for the merge information), but do not actually + make a commit, move the <tt>HEAD</tt>, or record <tt>$GIT_DIR/MERGE_HEAD</tt> + (to cause the next <tt>git commit</tt> command to create a merge + commit). This allows you to create a single commit on top of + the current branch whose effect is the same as merging another + branch (or more in case of an octopus). </p> <div class="paragraph"><p>With --no-squash perform the merge and commit the result. This option can be used to override --squash.</p></div> @@ -1828,7 +1827,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-10-18 15:11:10 PDT +Last updated 2014-04-08 12:47:26 PDT </div> </div> </body>
diff --git a/git-merge.txt b/git-merge.txt index 4395459..a3c1fa3 100644 --- a/git-merge.txt +++ b/git-merge.txt
@@ -10,7 +10,7 @@ -------- [verse] 'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit] - [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]] + [-s <strategy>] [-X <strategy-option>] [-S[<key-id>]] [--[no-]rerere-autoupdate] [-m <msg>] [<commit>...] 'git merge' <msg> HEAD <commit>... 'git merge' --abort
diff --git a/git-notes.html b/git-notes.html index c666bb2..92a3c5e 100644 --- a/git-notes.html +++ b/git-notes.html
@@ -756,7 +756,7 @@ <em>git notes</em> append [-F <file> | -m <msg> | (-c | -C) <object>] [<object>] <em>git notes</em> edit [<object>] <em>git notes</em> show [<object>] -<em>git notes</em> merge [-v | -q] [-s <strategy> ] <notes_ref> +<em>git notes</em> merge [-v | -q] [-s <strategy> ] <notes-ref> <em>git notes</em> merge --commit [-v | -q] <em>git notes</em> merge --abort [-v | -q] <em>git notes</em> remove [--ignore-missing] [--stdin] [<object>…] @@ -1306,7 +1306,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2014-01-27 13:30:07 PST +Last updated 2014-04-08 12:47:26 PDT </div> </div> </body>
diff --git a/git-notes.txt b/git-notes.txt index 84bb0fe..310f0a5 100644 --- a/git-notes.txt +++ b/git-notes.txt
@@ -14,7 +14,7 @@ 'git notes' append [-F <file> | -m <msg> | (-c | -C) <object>] [<object>] 'git notes' edit [<object>] 'git notes' show [<object>] -'git notes' merge [-v | -q] [-s <strategy> ] <notes_ref> +'git notes' merge [-v | -q] [-s <strategy> ] <notes-ref> 'git notes' merge --commit [-v | -q] 'git notes' merge --abort [-v | -q] 'git notes' remove [--ignore-missing] [--stdin] [<object>...]
diff --git a/git-prune.html b/git-prune.html index 6691c81..65a2f0f 100644 --- a/git-prune.html +++ b/git-prune.html
@@ -839,7 +839,7 @@ <div class="sect1"> <h2 id="_example">EXAMPLE</h2> <div class="sectionbody"> -<div class="paragraph"><p>To prune objects not used by your repository nor another that +<div class="paragraph"><p>To prune objects not used by your repository or another that borrows from your repository via its <tt>.git/objects/info/alternates</tt>:</p></div> <div class="listingblock"> @@ -876,7 +876,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2014-01-17 14:43:28 PST +Last updated 2014-04-08 12:47:26 PDT </div> </div> </body>
diff --git a/git-prune.txt b/git-prune.txt index 058ac0d..7a493c8 100644 --- a/git-prune.txt +++ b/git-prune.txt
@@ -56,7 +56,7 @@ EXAMPLE ------- -To prune objects not used by your repository nor another that +To prune objects not used by your repository or another that borrows from your repository via its `.git/objects/info/alternates`:
diff --git a/git-pull.html b/git-pull.html index 7095e5c..a898905 100644 --- a/git-pull.html +++ b/git-pull.html
@@ -963,14 +963,13 @@ </dt> <dd> <p> - Produce the working tree and index state as if a real - merge happened (except for the merge information), - but do not actually make a commit or - move the <tt>HEAD</tt>, nor record <tt>$GIT_DIR/MERGE_HEAD</tt> to - cause the next <tt>git commit</tt> command to create a merge - commit. This allows you to create a single commit on - top of the current branch whose effect is the same as - merging another branch (or more in case of an octopus). + Produce the working tree and index state as if a real merge + happened (except for the merge information), but do not actually + make a commit, move the <tt>HEAD</tt>, or record <tt>$GIT_DIR/MERGE_HEAD</tt> + (to cause the next <tt>git commit</tt> command to create a merge + commit). This allows you to create a single commit on top of + the current branch whose effect is the same as merging another + branch (or more in case of an octopus). </p> <div class="paragraph"><p>With --no-squash perform the merge and commit the result. This option can be used to override --squash.</p></div>
diff --git a/git-push.html b/git-push.html index a57d8ff..a58a25d 100644 --- a/git-push.html +++ b/git-push.html
@@ -1539,7 +1539,7 @@ will now start building on top of B.</p></div> <div class="paragraph"><p>The command by default does not allow an update that is not a fast-forward to prevent such loss of history.</p></div> -<div class="paragraph"><p>If you do not want to lose your work (history from X to B) nor the work by +<div class="paragraph"><p>If you do not want to lose your work (history from X to B) or the work by the other person (history from X to A), you would need to first fetch the history from the repository, create a history that contains changes done by both parties, and push the result back.</p></div> @@ -1733,7 +1733,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2014-03-11 14:35:07 PDT +Last updated 2014-04-08 12:47:26 PDT </div> </div> </body>
diff --git a/git-push.txt b/git-push.txt index 14862fb..21cd455 100644 --- a/git-push.txt +++ b/git-push.txt
@@ -385,7 +385,7 @@ The command by default does not allow an update that is not a fast-forward to prevent such loss of history. -If you do not want to lose your work (history from X to B) nor the work by +If you do not want to lose your work (history from X to B) or the work by the other person (history from X to A), you would need to first fetch the history from the repository, create a history that contains changes done by both parties, and push the result back.
diff --git a/git-read-tree.html b/git-read-tree.html index 071b737..26409e4 100644 --- a/git-read-tree.html +++ b/git-read-tree.html
@@ -828,7 +828,7 @@ <dd> <p> Check if the command would error out, without updating the index - nor the files in the working tree for real. + or the files in the working tree for real. </p> </dd> <dt class="hdlist1"> @@ -1294,7 +1294,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-08-20 08:40:27 PDT +Last updated 2014-04-08 12:47:26 PDT </div> </div> </body>
diff --git a/git-read-tree.txt b/git-read-tree.txt index c4bde65..056c0db 100644 --- a/git-read-tree.txt +++ b/git-read-tree.txt
@@ -57,7 +57,7 @@ -n:: --dry-run:: Check if the command would error out, without updating the index - nor the files in the working tree for real. + or the files in the working tree for real. -v:: Show the progress of checking files out.
diff --git a/git-reset.html b/git-reset.html index d6138c1..96f4bb0 100644 --- a/git-reset.html +++ b/git-reset.html
@@ -771,7 +771,7 @@ <dd> <p> This form resets the index entries for all <paths> to their - state at <tree-ish>. (It does not affect the working tree, nor + state at <tree-ish>. (It does not affect the working tree or the current branch.) </p> <div class="paragraph"><p>This means that <tt>git reset <paths></tt> is the opposite of <tt>git add @@ -814,7 +814,7 @@ </dt> <dd> <p> - Does not touch the index file nor the working tree at all (but + Does not touch the index file or the working tree at all (but resets the head to <commit>, just like all modes do). This leaves all your changed files "Changes to be committed", as <em>git status</em> would put it. @@ -927,7 +927,7 @@ <p> However, you already dirtied the index (i.e. your index does not match the HEAD commit). But you know the pull you are going -to make does not affect frotz.c nor filfre.c, so you revert the +to make does not affect frotz.c or filfre.c, so you revert the index changes for these two files. Your changes in working tree remain there. </p> @@ -1354,7 +1354,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2014-02-27 15:06:29 PST +Last updated 2014-04-08 12:47:26 PDT </div> </div> </body>
diff --git a/git-reset.txt b/git-reset.txt index a077ba0..25432d9 100644 --- a/git-reset.txt +++ b/git-reset.txt
@@ -21,7 +21,7 @@ 'git reset' [-q] [<tree-ish>] [--] <paths>...:: This form resets the index entries for all <paths> to their - state at <tree-ish>. (It does not affect the working tree, nor + state at <tree-ish>. (It does not affect the working tree or the current branch.) + This means that `git reset <paths>` is the opposite of `git add @@ -51,7 +51,7 @@ + -- --soft:: - Does not touch the index file nor the working tree at all (but + Does not touch the index file or the working tree at all (but resets the head to <commit>, just like all modes do). This leaves all your changed files "Changes to be committed", as 'git status' would put it. @@ -118,7 +118,7 @@ <2> Somebody asks you to pull, and the changes sounds worthy of merging. <3> However, you already dirtied the index (i.e. your index does not match the HEAD commit). But you know the pull you are going -to make does not affect frotz.c nor filfre.c, so you revert the +to make does not affect frotz.c or filfre.c, so you revert the index changes for these two files. Your changes in working tree remain there. <4> Then you can pull and merge, leaving frotz.c and filfre.c
diff --git a/git-rev-list.html b/git-rev-list.html index 859f335..7528988 100644 --- a/git-rev-list.html +++ b/git-rev-list.html
@@ -1263,7 +1263,7 @@ reflog entries from the most recent one to older ones. When this option is used you cannot specify commits to exclude (that is, <em>^commit</em>, <em>commit1..commit2</em>, - nor <em>commit1...commit2</em> notations cannot be used). + and <em>commit1...commit2</em> notations cannot be used). </p> <div class="paragraph"><p>With <tt>--pretty</tt> format other than <tt>oneline</tt> (for obvious reasons), this causes the output to have two extra lines of information @@ -1937,7 +1937,7 @@ Show the notes (see <a href="git-notes.html">git-notes(1)</a>) that annotate the commit, when showing the commit log message. This is the default for <tt>git log</tt>, <tt>git show</tt> and <tt>git whatchanged</tt> commands when - there is no <tt>--pretty</tt>, <tt>--format</tt> nor <tt>--oneline</tt> option given + there is no <tt>--pretty</tt>, <tt>--format</tt>, or <tt>--oneline</tt> option given on the command line. </p> <div class="paragraph"><p>By default, the notes shown are from the notes refs listed in the @@ -2249,7 +2249,7 @@ stored in the commit object. Notably, the SHA-1s are displayed in full, regardless of whether --abbrev or --no-abbrev are used, and <em>parents</em> information show the -true parent commits, without taking grafts nor history +true parent commits, without taking grafts or history simplification into account.</p></div> </li> <li>
diff --git a/git-rev-parse.html b/git-rev-parse.html index 72892e7..5f4aa22 100644 --- a/git-rev-parse.html +++ b/git-rev-parse.html
@@ -1647,18 +1647,18 @@ <div class="paragraph"><p>Each line of options has this format:</p></div> <div class="listingblock"> <div class="content"> -<pre><tt><opt_spec><flags>*<arg_hint>? SP+ help LF</tt></pre> +<pre><tt><opt-spec><flags>*<arg-hint>? SP+ help LF</tt></pre> </div></div> <div class="dlist"><dl> <dt class="hdlist1"> -<tt><opt_spec></tt> +<tt><opt-spec></tt> </dt> <dd> <p> its format is the short option character, then the long option name separated by a comma. Both parts are not required, though at least one is necessary. <tt>h,help</tt>, <tt>dry-run</tt> and <tt>f</tt> are all three correct - <tt><opt_spec></tt>. + <tt><opt-spec></tt>. </p> </dd> <dt class="hdlist1"> @@ -1696,14 +1696,14 @@ </ul></div> </dd> <dt class="hdlist1"> -<tt><arg_hint></tt> +<tt><arg-hint></tt> </dt> <dd> <p> - <tt><arg_hint></tt>, if specified, is used as a name of the argument in the - help output, for options that take arguments. <tt><arg_hint></tt> is - terminated by the first whitespace. When you need to use space in the - argument hint use dash instead. + <tt><arg-hint></tt>, if specified, is used as a name of the argument in the + help output, for options that take arguments. <tt><arg-hint></tt> is + terminated by the first whitespace. It is customary to use a + dash to separate words in a multi-word argument hint. </p> </dd> </dl></div> @@ -1748,7 +1748,7 @@ -h, --help show the help --foo some nifty option --foo --bar ... some cool option --bar with an argument - --bar <arg> another cool option --baz with a named argument + --baz <arg> another cool option --baz with a named argument --qux[=<path>] qux may take a path argument but has meaning by itself An option group Header @@ -1830,7 +1830,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2014-03-31 17:26:22 PDT +Last updated 2014-04-08 12:47:26 PDT </div> </div> </body>
diff --git a/git-rev-parse.txt b/git-rev-parse.txt index e05e6b3..987395d 100644 --- a/git-rev-parse.txt +++ b/git-rev-parse.txt
@@ -290,14 +290,14 @@ Each line of options has this format: ------------ -<opt_spec><flags>*<arg_hint>? SP+ help LF +<opt-spec><flags>*<arg-hint>? SP+ help LF ------------ -`<opt_spec>`:: +`<opt-spec>`:: its format is the short option character, then the long option name separated by a comma. Both parts are not required, though at least one is necessary. `h,help`, `dry-run` and `f` are all three correct - `<opt_spec>`. + `<opt-spec>`. `<flags>`:: `<flags>` are of `*`, `=`, `?` or `!`. @@ -313,11 +313,11 @@ * Use `!` to not make the corresponding negated long option available. -`<arg_hint>`:: - `<arg_hint>`, if specified, is used as a name of the argument in the - help output, for options that take arguments. `<arg_hint>` is - terminated by the first whitespace. When you need to use space in the - argument hint use dash instead. +`<arg-hint>`:: + `<arg-hint>`, if specified, is used as a name of the argument in the + help output, for options that take arguments. `<arg-hint>` is + terminated by the first whitespace. It is customary to use a + dash to separate words in a multi-word argument hint. The remainder of the line, after stripping the spaces, is used as the help associated to the option. @@ -363,7 +363,7 @@ -h, --help show the help --foo some nifty option --foo --bar ... some cool option --bar with an argument - --bar <arg> another cool option --baz with a named argument + --baz <arg> another cool option --baz with a named argument --qux[=<path>] qux may take a path argument but has meaning by itself An option group Header
diff --git a/git-revert.html b/git-revert.html index b559a7f..97dc2e8 100644 --- a/git-revert.html +++ b/git-revert.html
@@ -750,7 +750,7 @@ <h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> <div class="verseblock"> -<pre class="content"><em>git revert</em> [--[no-]edit] [-n] [-m parent-number] [-s] [-S[<keyid>]] <commit>… +<pre class="content"><em>git revert</em> [--[no-]edit] [-n] [-m parent-number] [-s] [-S[<key-id>]] <commit>… <em>git revert</em> --continue <em>git revert</em> --quit <em>git revert</em> --abort</pre> @@ -856,10 +856,10 @@ effect to your index in a row.</p></div> </dd> <dt class="hdlist1"> --S[<keyid>] +-S[<key-id>] </dt> <dt class="hdlist1"> ---gpg-sign[=<keyid>] +--gpg-sign[=<key-id>] </dt> <dd> <p> @@ -981,7 +981,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2014-02-27 15:06:29 PST +Last updated 2014-04-08 12:47:26 PDT </div> </div> </body>
diff --git a/git-revert.txt b/git-revert.txt index 9eb83f0..cceb5f2 100644 --- a/git-revert.txt +++ b/git-revert.txt
@@ -8,7 +8,7 @@ SYNOPSIS -------- [verse] -'git revert' [--[no-]edit] [-n] [-m parent-number] [-s] [-S[<keyid>]] <commit>... +'git revert' [--[no-]edit] [-n] [-m parent-number] [-s] [-S[<key-id>]] <commit>... 'git revert' --continue 'git revert' --quit 'git revert' --abort @@ -80,8 +80,8 @@ This is useful when reverting more than one commits' effect to your index in a row. --S[<keyid>]:: ---gpg-sign[=<keyid>]:: +-S[<key-id>]:: +--gpg-sign[=<key-id>]:: GPG-sign commits. -s::
diff --git a/git-show-branch.html b/git-show-branch.html index c559bbc..c1b53fa 100644 --- a/git-show-branch.html +++ b/git-show-branch.html
@@ -768,7 +768,7 @@ and/or refs/tags) semi-visually.</p></div> <div class="paragraph"><p>It cannot show more than 29 branches and commits at a time.</p></div> <div class="paragraph"><p>It uses <tt>showbranch.default</tt> multi-valued configuration items if -no <rev> nor <glob> is given on the command line.</p></div> +no <rev> or <glob> is given on the command line.</p></div> </div> </div> <div class="sect1"> @@ -1047,7 +1047,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-08-20 08:40:27 PDT +Last updated 2014-04-08 12:47:26 PDT </div> </div> </body>
diff --git a/git-show-branch.txt b/git-show-branch.txt index a515648..b91d4e5 100644 --- a/git-show-branch.txt +++ b/git-show-branch.txt
@@ -25,7 +25,7 @@ It cannot show more than 29 branches and commits at a time. It uses `showbranch.default` multi-valued configuration items if -no <rev> nor <glob> is given on the command line. +no <rev> or <glob> is given on the command line. OPTIONS
diff --git a/git-show-ref.html b/git-show-ref.html index 803aeb6..579ecee 100644 --- a/git-show-ref.html +++ b/git-show-ref.html
@@ -875,7 +875,7 @@ Show references matching one or more patterns. Patterns are matched from the end of the full name, and only complete parts are matched, e.g. <em>master</em> matches <em>refs/heads/master</em>, <em>refs/remotes/origin/master</em>, - <em>refs/tags/jedi/master</em> but not <em>refs/heads/mymaster</em> nor + <em>refs/tags/jedi/master</em> but not <em>refs/heads/mymaster</em> or <em>refs/remotes/master/jedi</em>. </p> </dd> @@ -976,7 +976,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2014-01-22 14:45:04 PST +Last updated 2014-04-08 12:47:26 PDT </div> </div> </body>
diff --git a/git-show-ref.txt b/git-show-ref.txt index ffd1b03..2a6f89b 100644 --- a/git-show-ref.txt +++ b/git-show-ref.txt
@@ -89,7 +89,7 @@ Show references matching one or more patterns. Patterns are matched from the end of the full name, and only complete parts are matched, e.g. 'master' matches 'refs/heads/master', 'refs/remotes/origin/master', - 'refs/tags/jedi/master' but not 'refs/heads/mymaster' nor + 'refs/tags/jedi/master' but not 'refs/heads/mymaster' or 'refs/remotes/master/jedi'. OUTPUT
diff --git a/git-show.html b/git-show.html index 4ab1491..ba90b32 100644 --- a/git-show.html +++ b/git-show.html
@@ -854,7 +854,7 @@ Show the notes (see <a href="git-notes.html">git-notes(1)</a>) that annotate the commit, when showing the commit log message. This is the default for <tt>git log</tt>, <tt>git show</tt> and <tt>git whatchanged</tt> commands when - there is no <tt>--pretty</tt>, <tt>--format</tt> nor <tt>--oneline</tt> option given + there is no <tt>--pretty</tt>, <tt>--format</tt>, or <tt>--oneline</tt> option given on the command line. </p> <div class="paragraph"><p>By default, the notes shown are from the notes refs listed in the @@ -1030,7 +1030,7 @@ stored in the commit object. Notably, the SHA-1s are displayed in full, regardless of whether --abbrev or --no-abbrev are used, and <em>parents</em> information show the -true parent commits, without taking grafts nor history +true parent commits, without taking grafts or history simplification into account.</p></div> </li> <li> @@ -1987,7 +1987,7 @@ <p> Omit the preimage for deletes, i.e. print only the header but not the diff between the preimage and <tt>/dev/null</tt>. The resulting patch - is not meant to be applied with <tt>patch</tt> nor <tt>git apply</tt>; this is + is not meant to be applied with <tt>patch</tt> or <tt>git apply</tt>; this is solely for people who want to just concentrate on reviewing the text after the change. In addition, the output obviously lack enough information to apply such a patch in reverse, even manually, @@ -2476,7 +2476,7 @@ <div class="paragraph"><p>In the above example output, the function signature was changed from both files (hence two <tt>-</tt> removals from both file1 and file2, plus <tt>++</tt> to mean one line that was added does not appear -in either file1 nor file2). Also eight other lines are the same +in either file1 or file2). Also eight other lines are the same from file1 but do not appear in file2 (hence prefixed with <tt>+</tt>).</p></div> <div class="paragraph"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the
diff --git a/git-update-index.html b/git-update-index.html index 4f48329..99465f1 100644 --- a/git-update-index.html +++ b/git-update-index.html
@@ -753,7 +753,7 @@ <pre class="content"><em>git update-index</em> [--add] [--remove | --force-remove] [--replace] [--refresh] [-q] [--unmerged] [--ignore-missing] - [(--cacheinfo <mode> <object> <file>)…] + [(--cacheinfo <mode>,<object>,<file>)…] [--chmod=(+|-)x] [--[no-]assume-unchanged] [--[no-]skip-worktree] @@ -850,11 +850,17 @@ </p> </dd> <dt class="hdlist1"> +--cacheinfo <mode>,<object>,<path> +</dt> +<dt class="hdlist1"> --cacheinfo <mode> <object> <path> </dt> <dd> <p> - Directly insert the specified info into the index. + Directly insert the specified info into the index. For + backward compatibility, you can also give these three + arguments as three separate parameters, but new users are + encouraged to use a single-parameter form. </p> </dd> <dt class="hdlist1"> @@ -1298,7 +1304,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-08-20 08:40:27 PDT +Last updated 2014-04-08 12:47:26 PDT </div> </div> </body>
diff --git a/git-update-index.txt b/git-update-index.txt index e0a8702..d6de4a0 100644 --- a/git-update-index.txt +++ b/git-update-index.txt
@@ -12,7 +12,7 @@ 'git update-index' [--add] [--remove | --force-remove] [--replace] [--refresh] [-q] [--unmerged] [--ignore-missing] - [(--cacheinfo <mode> <object> <file>)...] + [(--cacheinfo <mode>,<object>,<file>)...] [--chmod=(+|-)x] [--[no-]assume-unchanged] [--[no-]skip-worktree] @@ -68,8 +68,12 @@ --ignore-missing:: Ignores missing files during a --refresh +--cacheinfo <mode>,<object>,<path>:: --cacheinfo <mode> <object> <path>:: - Directly insert the specified info into the index. + Directly insert the specified info into the index. For + backward compatibility, you can also give these three + arguments as three separate parameters, but new users are + encouraged to use a single-parameter form. --index-info:: Read index information from stdin.
diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html index f0c1880..ff91c8a 100644 --- a/howto/rebase-from-internal-branch.html +++ b/howto/rebase-from-internal-branch.html
@@ -865,7 +865,7 @@ <pre><tt>$ git fetch upstream</tt></pre> </div></div> <div class="paragraph"><p>This leaves the updated upstream head in .git/FETCH_HEAD but -does not touch your .git/HEAD nor .git/refs/heads/master. +does not touch your .git/HEAD or .git/refs/heads/master. You run "git rebase" now.</p></div> <div class="literalblock"> <div class="content"> @@ -895,7 +895,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2014-02-24 13:03:25 PST +Last updated 2014-04-08 12:47:42 PDT </div> </div> </body>
diff --git a/howto/rebase-from-internal-branch.txt b/howto/rebase-from-internal-branch.txt index 19ab604..02cb5f7 100644 --- a/howto/rebase-from-internal-branch.txt +++ b/howto/rebase-from-internal-branch.txt
@@ -139,7 +139,7 @@ $ git fetch upstream This leaves the updated upstream head in .git/FETCH_HEAD but -does not touch your .git/HEAD nor .git/refs/heads/master. +does not touch your .git/HEAD or .git/refs/heads/master. You run "git rebase" now. $ git rebase FETCH_HEAD master
diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html index 18fa11e..abfa007 100644 --- a/howto/revert-a-faulty-merge.html +++ b/howto/revert-a-faulty-merge.html
@@ -785,7 +785,7 @@ <div class="paragraph"><p>where C and D are to fix what was broken in A and B, and you may already have some other changes on the mainline after W.</p></div> <div class="paragraph"><p>If you merge the updated side branch (with D at its tip), none of the -changes made in A nor B will be in the result, because they were reverted +changes made in A or B will be in the result, because they were reverted by W. That is what Alan saw.</p></div> <div class="paragraph"><p>Linus explains the situation:</p></div> <div class="literalblock"> @@ -829,7 +829,7 @@ <pre><tt>$ git revert W</tt></pre> </div></div> <div class="paragraph"><p>This history would (ignoring possible conflicts between what W and W..Y -changed) be equivalent to not having W nor Y at all in the history:</p></div> +changed) be equivalent to not having W or Y at all in the history:</p></div> <div class="literalblock"> <div class="content"> <pre><tt>---o---o---o---M---x---x-------x---- @@ -1025,7 +1025,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2014-02-24 13:03:24 PST +Last updated 2014-04-08 12:47:42 PDT </div> </div> </body>
diff --git a/howto/revert-a-faulty-merge.txt b/howto/revert-a-faulty-merge.txt index acf3e47..462255e 100644 --- a/howto/revert-a-faulty-merge.txt +++ b/howto/revert-a-faulty-merge.txt
@@ -54,7 +54,7 @@ have some other changes on the mainline after W. If you merge the updated side branch (with D at its tip), none of the -changes made in A nor B will be in the result, because they were reverted +changes made in A or B will be in the result, because they were reverted by W. That is what Alan saw. Linus explains the situation: @@ -90,7 +90,7 @@ $ git revert W This history would (ignoring possible conflicts between what W and W..Y -changed) be equivalent to not having W nor Y at all in the history: +changed) be equivalent to not having W or Y at all in the history: ---o---o---o---M---x---x-------x---- /
diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html index 9eb8c84..7f6dc08 100644 --- a/howto/revert-branch-rebase.html +++ b/howto/revert-branch-rebase.html
@@ -855,7 +855,7 @@ $ make clean test ;# make sure it did not cause other breakage.</tt></pre> </div></div> <div class="paragraph"><p>Everything is in the good order. I do not need the temporary branch -nor tag anymore, so remove them:</p></div> +or tag anymore, so remove them:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ rm -f .git/refs/tags/pu-anchor @@ -907,7 +907,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2014-02-24 13:03:22 PST +Last updated 2014-04-08 12:47:41 PDT </div> </div> </body>
diff --git a/howto/revert-branch-rebase.txt b/howto/revert-branch-rebase.txt index 85f69db..149508e 100644 --- a/howto/revert-branch-rebase.txt +++ b/howto/revert-branch-rebase.txt
@@ -137,7 +137,7 @@ ------------------------------------------------ Everything is in the good order. I do not need the temporary branch -nor tag anymore, so remove them: +or tag anymore, so remove them: ------------------------------------------------ $ rm -f .git/refs/tags/pu-anchor
diff --git a/merge-options.txt b/merge-options.txt index e134315..f08e9b8 100644 --- a/merge-options.txt +++ b/merge-options.txt
@@ -63,14 +63,13 @@ --squash:: --no-squash:: - Produce the working tree and index state as if a real - merge happened (except for the merge information), - but do not actually make a commit or - move the `HEAD`, nor record `$GIT_DIR/MERGE_HEAD` to - cause the next `git commit` command to create a merge - commit. This allows you to create a single commit on - top of the current branch whose effect is the same as - merging another branch (or more in case of an octopus). + Produce the working tree and index state as if a real merge + happened (except for the merge information), but do not actually + make a commit, move the `HEAD`, or record `$GIT_DIR/MERGE_HEAD` + (to cause the next `git commit` command to create a merge + commit). This allows you to create a single commit on top of + the current branch whose effect is the same as merging another + branch (or more in case of an octopus). + With --no-squash perform the merge and commit the result. This option can be used to override --squash.
diff --git a/pretty-formats.txt b/pretty-formats.txt index 1d174fd..85d6353 100644 --- a/pretty-formats.txt +++ b/pretty-formats.txt
@@ -78,7 +78,7 @@ stored in the commit object. Notably, the SHA-1s are displayed in full, regardless of whether --abbrev or --no-abbrev are used, and 'parents' information show the -true parent commits, without taking grafts nor history +true parent commits, without taking grafts or history simplification into account. * 'format:<string>'
diff --git a/pretty-options.txt b/pretty-options.txt index eea0e30..8569e29 100644 --- a/pretty-options.txt +++ b/pretty-options.txt
@@ -39,7 +39,7 @@ Show the notes (see linkgit:git-notes[1]) that annotate the commit, when showing the commit log message. This is the default for `git log`, `git show` and `git whatchanged` commands when - there is no `--pretty`, `--format` nor `--oneline` option given + there is no `--pretty`, `--format`, or `--oneline` option given on the command line. + By default, the notes shown are from the notes refs listed in the
diff --git a/rev-list-options.txt b/rev-list-options.txt index b813961..deb8cca 100644 --- a/rev-list-options.txt +++ b/rev-list-options.txt
@@ -237,7 +237,7 @@ reflog entries from the most recent one to older ones. When this option is used you cannot specify commits to exclude (that is, '{caret}commit', 'commit1..commit2', - nor 'commit1\...commit2' notations cannot be used). + and 'commit1\...commit2' notations cannot be used). + With `--pretty` format other than `oneline` (for obvious reasons), this causes the output to have two extra lines of information diff --git a/technical/api-gitattributes.html b/technical/api-gitattributes.html index 8984129..33e592f 100644 --- a/technical/api-gitattributes.html +++ b/technical/api-gitattributes.html
@@ -889,7 +889,7 @@ The attribute is Unset, by listing the name of the attribute prefixed with a dash - for the path. } else if (ATTR_UNSET(value)) { - The attribute is not set nor unset for the path. + The attribute is neither set nor unset for the path. } else if (!strcmp(value, "input")) { If none of ATTR_TRUE(), ATTR_FALSE(), or ATTR_UNSET() is true, the value is a string set in the gitattributes @@ -933,7 +933,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-08-20 08:40:27 PDT +Last updated 2014-04-08 12:47:26 PDT </div> </div> </body> diff --git a/technical/api-gitattributes.txt b/technical/api-gitattributes.txt index ce363b6..2602668 100644 --- a/technical/api-gitattributes.txt +++ b/technical/api-gitattributes.txt
@@ -99,7 +99,7 @@ The attribute is Unset, by listing the name of the attribute prefixed with a dash - for the path. } else if (ATTR_UNSET(value)) { - The attribute is not set nor unset for the path. + The attribute is neither set nor unset for the path. } else if (!strcmp(value, "input")) { If none of ATTR_TRUE(), ATTR_FALSE(), or ATTR_UNSET() is true, the value is a string set in the gitattributes diff --git a/technical/api-parse-options.html b/technical/api-parse-options.html index 083699d..4dd0cb8 100644 --- a/technical/api-parse-options.html +++ b/technical/api-parse-options.html
@@ -1031,15 +1031,6 @@ </p> </dd> <dt class="hdlist1"> -<tt>OPT_SET_PTR(short, long, &ptr_var, description, ptr)</tt> -</dt> -<dd> -<p> - Introduce a boolean option. - If used, set <tt>ptr_var</tt> to <tt>ptr</tt>. -</p> -</dd> -<dt class="hdlist1"> <tt>OPT_STRING(short, long, &str_var, arg_str, description)</tt> </dt> <dd> @@ -1246,7 +1237,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-12-06 15:42:42 PST +Last updated 2014-04-08 12:47:26 PDT </div> </div> </body>
diff --git a/technical/api-parse-options.txt b/technical/api-parse-options.txt index be50cf4..1f2db31 100644 --- a/technical/api-parse-options.txt +++ b/technical/api-parse-options.txt
@@ -160,10 +160,6 @@ `int_var` is set to `integer` with `--option`, and reset to zero with `--no-option`. -`OPT_SET_PTR(short, long, &ptr_var, description, ptr)`:: - Introduce a boolean option. - If used, set `ptr_var` to `ptr`. - `OPT_STRING(short, long, &str_var, arg_str, description)`:: Introduce an option with string argument. The string argument is put into `str_var`.
diff --git a/technical/pack-protocol.html b/technical/pack-protocol.html index cc6cea4..527b47d 100644 --- a/technical/pack-protocol.html +++ b/technical/pack-protocol.html
@@ -986,10 +986,10 @@ this transaction, which is the number of commits it wants from the tip of the history, if any, as a <em>deepen</em> line. A depth of 0 is the same as not making a depth request. The client does not want to receive -any commits beyond this depth, nor objects needed only to complete -those commits. Commits whose parents are not received as a result are -defined as shallow and marked as such in the server. This information -is sent back to the client in the next step.</p></div> +any commits beyond this depth, nor does it want objects needed only to +complete those commits. Commits whose parents are not received as a +result are defined as shallow and marked as such in the server. This +information is sent back to the client in the next step.</p></div> <div class="paragraph"><p>Once all the <em>want’s and 'shallow’s (and optional 'deepen</em>) are transferred, clients MUST send a flush-pkt, to tell the server side that it is done sending the list.</p></div> @@ -1307,7 +1307,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2014-02-27 15:06:29 PST +Last updated 2014-04-08 12:47:26 PDT </div> </div> </body>
diff --git a/technical/pack-protocol.txt b/technical/pack-protocol.txt index 39c6410..18dea8d 100644 --- a/technical/pack-protocol.txt +++ b/technical/pack-protocol.txt
@@ -237,10 +237,10 @@ this transaction, which is the number of commits it wants from the tip of the history, if any, as a 'deepen' line. A depth of 0 is the same as not making a depth request. The client does not want to receive -any commits beyond this depth, nor objects needed only to complete -those commits. Commits whose parents are not received as a result are -defined as shallow and marked as such in the server. This information -is sent back to the client in the next step. +any commits beyond this depth, nor does it want objects needed only to +complete those commits. Commits whose parents are not received as a +result are defined as shallow and marked as such in the server. This +information is sent back to the client in the next step. Once all the 'want's and 'shallow's (and optional 'deepen') are transferred, clients MUST send a flush-pkt, to tell the server side
diff --git a/technical/protocol-common.html b/technical/protocol-common.html index 25a9bf3..a009ca7 100644 --- a/technical/protocol-common.html +++ b/technical/protocol-common.html
@@ -790,7 +790,7 @@ </li> <li> <p> -They cannot end with a slash <tt>/</tt> nor a dot <tt>.</tt>. +They cannot end with a slash <tt>/</tt> or a dot <tt>.</tt>. </p> </li> <li> @@ -856,7 +856,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-08-20 08:40:27 PDT +Last updated 2014-04-08 12:47:26 PDT </div> </div> </body>
diff --git a/technical/protocol-common.txt b/technical/protocol-common.txt index fb7ff08..889985f 100644 --- a/technical/protocol-common.txt +++ b/technical/protocol-common.txt
@@ -39,7 +39,7 @@ caret `^`, colon `:`, question-mark `?`, asterisk `*`, or open bracket `[` anywhere. -. They cannot end with a slash `/` nor a dot `.`. +. They cannot end with a slash `/` or a dot `.`. . They cannot end with the sequence `.lock`.
diff --git a/user-manual.html b/user-manual.html index 0972c48..599ee15 100644 --- a/user-manual.html +++ b/user-manual.html
@@ -1,5 +1,5 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> -<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Git User Manual</title><link rel="stylesheet" type="text/css" href="docbook-xsl.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div lang="en" class="article" title="Git User Manual"><div class="titlepage"><div><div><h2 class="title"><a name="idp79984"></a>Git User Manual</h2></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="#repositories-and-branches">Repositories and Branches</a></span></dt><dd><dl><dt><span class="section"><a href="#how-to-get-a-git-repository">How to get a Git repository</a></span></dt><dt><span class="section"><a href="#how-to-check-out">How to check out a different version of a project</a></span></dt><dt><span class="section"><a href="#understanding-commits">Understanding History: Commits</a></span></dt><dt><span class="section"><a href="#manipulating-branches">Manipulating branches</a></span></dt><dt><span class="section"><a href="#detached-head">Examining an old version without creating a new branch</a></span></dt><dt><span class="section"><a href="#examining-remote-branches">Examining branches from a remote repository</a></span></dt><dt><span class="section"><a href="#how-git-stores-references">Naming branches, tags, and other references</a></span></dt><dt><span class="section"><a href="#Updating-a-repository-With-git-fetch">Updating a repository with git fetch</a></span></dt><dt><span class="section"><a href="#fetching-branches">Fetching branches from other repositories</a></span></dt></dl></dd><dt><span class="section"><a href="#exploring-git-history">Exploring Git history</a></span></dt><dd><dl><dt><span class="section"><a href="#using-bisect">How to use bisect to find a regression</a></span></dt><dt><span class="section"><a href="#naming-commits">Naming commits</a></span></dt><dt><span class="section"><a href="#creating-tags">Creating tags</a></span></dt><dt><span class="section"><a href="#browsing-revisions">Browsing revisions</a></span></dt><dt><span class="section"><a href="#generating-diffs">Generating diffs</a></span></dt><dt><span class="section"><a href="#viewing-old-file-versions">Viewing old file versions</a></span></dt><dt><span class="section"><a href="#history-examples">Examples</a></span></dt></dl></dd><dt><span class="section"><a href="#Developing-With-git">Developing with Git</a></span></dt><dd><dl><dt><span class="section"><a href="#telling-git-your-name">Telling Git your name</a></span></dt><dt><span class="section"><a href="#creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#how-to-make-a-commit">How to make a commit</a></span></dt><dt><span class="section"><a href="#creating-good-commit-messages">Creating good commit messages</a></span></dt><dt><span class="section"><a href="#ignoring-files">Ignoring files</a></span></dt><dt><span class="section"><a href="#how-to-merge">How to merge</a></span></dt><dt><span class="section"><a href="#resolving-a-merge">Resolving a merge</a></span></dt><dt><span class="section"><a href="#undoing-a-merge">Undoing a merge</a></span></dt><dt><span class="section"><a href="#fast-forwards">Fast-forward merges</a></span></dt><dt><span class="section"><a href="#fixing-mistakes">Fixing mistakes</a></span></dt><dt><span class="section"><a href="#ensuring-good-performance">Ensuring good performance</a></span></dt><dt><span class="section"><a href="#ensuring-reliability">Ensuring reliability</a></span></dt></dl></dd><dt><span class="section"><a href="#sharing-development">Sharing development with others</a></span></dt><dd><dl><dt><span class="section"><a href="#getting-updates-With-git-pull">Getting updates with git pull</a></span></dt><dt><span class="section"><a href="#submitting-patches">Submitting patches to a project</a></span></dt><dt><span class="section"><a href="#importing-patches">Importing patches to a project</a></span></dt><dt><span class="section"><a href="#public-repositories">Public Git repositories</a></span></dt><dt><span class="section"><a href="#sharing-development-examples">Examples</a></span></dt></dl></dd><dt><span class="section"><a href="#cleaning-up-history">Rewriting history and maintaining patch series</a></span></dt><dd><dl><dt><span class="section"><a href="#patch-series">Creating the perfect patch series</a></span></dt><dt><span class="section"><a href="#using-git-rebase">Keeping a patch series up to date using git rebase</a></span></dt><dt><span class="section"><a href="#rewriting-one-commit">Rewriting a single commit</a></span></dt><dt><span class="section"><a href="#reordering-patch-series">Reordering or selecting from a patch series</a></span></dt><dt><span class="section"><a href="#interactive-rebase">Using interactive rebases</a></span></dt><dt><span class="section"><a href="#patch-series-tools">Other tools</a></span></dt><dt><span class="section"><a href="#problems-With-rewriting-history">Problems with rewriting history</a></span></dt><dt><span class="section"><a href="#bisect-merges">Why bisecting merge commits can be harder than bisecting linear history</a></span></dt></dl></dd><dt><span class="section"><a href="#advanced-branch-management">Advanced branch management</a></span></dt><dd><dl><dt><span class="section"><a href="#fetching-individual-branches">Fetching individual branches</a></span></dt><dt><span class="section"><a href="#fetch-fast-forwards">git fetch and fast-forwards</a></span></dt><dt><span class="section"><a href="#forcing-fetch">Forcing git fetch to do non-fast-forward updates</a></span></dt><dt><span class="section"><a href="#remote-branch-configuration">Configuring remote-tracking branches</a></span></dt></dl></dd><dt><span class="section"><a href="#git-concepts">Git concepts</a></span></dt><dd><dl><dt><span class="section"><a href="#the-object-database">The Object Database</a></span></dt><dt><span class="section"><a href="#the-index">The index</a></span></dt></dl></dd><dt><span class="section"><a href="#submodules">Submodules</a></span></dt><dd><dl><dt><span class="section"><a href="#_pitfalls_with_submodules">Pitfalls with submodules</a></span></dt></dl></dd><dt><span class="section"><a href="#low-level-operations">Low-level Git operations</a></span></dt><dd><dl><dt><span class="section"><a href="#object-manipulation">Object access and manipulation</a></span></dt><dt><span class="section"><a href="#the-workflow">The Workflow</a></span></dt><dt><span class="section"><a href="#examining-the-data">Examining the data</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees">Merging multiple trees</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees-2">Merging multiple trees, continued</a></span></dt></dl></dd><dt><span class="section"><a href="#hacking-git">Hacking Git</a></span></dt><dd><dl><dt><span class="section"><a href="#object-details">Object storage format</a></span></dt><dt><span class="section"><a href="#birdview-on-the-source-code">A birds-eye view of Git’s source code</a></span></dt></dl></dd><dt><span class="section"><a href="#glossary">Git Glossary</a></span></dt><dt><span class="appendix"><a href="#git-quick-start">A. Git Quick Reference</a></span></dt><dd><dl><dt><span class="section"><a href="#quick-creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#managing-branches">Managing branches</a></span></dt><dt><span class="section"><a href="#exploring-history">Exploring history</a></span></dt><dt><span class="section"><a href="#making-changes">Making changes</a></span></dt><dt><span class="section"><a href="#merging">Merging</a></span></dt><dt><span class="section"><a href="#sharing-your-changes">Sharing your changes</a></span></dt><dt><span class="section"><a href="#repository-maintenance">Repository maintenance</a></span></dt></dl></dd><dt><span class="appendix"><a href="#todo">B. Notes and todo list for this manual</a></span></dt></dl></div><p>Git is a fast distributed revision control system.</p><p>This manual is designed to be readable by someone with basic UNIX +<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Git User Manual</title><link rel="stylesheet" type="text/css" href="docbook-xsl.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div lang="en" class="article" title="Git User Manual"><div class="titlepage"><div><div><h2 class="title"><a name="idp144816"></a>Git User Manual</h2></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="#repositories-and-branches">Repositories and Branches</a></span></dt><dd><dl><dt><span class="section"><a href="#how-to-get-a-git-repository">How to get a Git repository</a></span></dt><dt><span class="section"><a href="#how-to-check-out">How to check out a different version of a project</a></span></dt><dt><span class="section"><a href="#understanding-commits">Understanding History: Commits</a></span></dt><dt><span class="section"><a href="#manipulating-branches">Manipulating branches</a></span></dt><dt><span class="section"><a href="#detached-head">Examining an old version without creating a new branch</a></span></dt><dt><span class="section"><a href="#examining-remote-branches">Examining branches from a remote repository</a></span></dt><dt><span class="section"><a href="#how-git-stores-references">Naming branches, tags, and other references</a></span></dt><dt><span class="section"><a href="#Updating-a-repository-With-git-fetch">Updating a repository with git fetch</a></span></dt><dt><span class="section"><a href="#fetching-branches">Fetching branches from other repositories</a></span></dt></dl></dd><dt><span class="section"><a href="#exploring-git-history">Exploring Git history</a></span></dt><dd><dl><dt><span class="section"><a href="#using-bisect">How to use bisect to find a regression</a></span></dt><dt><span class="section"><a href="#naming-commits">Naming commits</a></span></dt><dt><span class="section"><a href="#creating-tags">Creating tags</a></span></dt><dt><span class="section"><a href="#browsing-revisions">Browsing revisions</a></span></dt><dt><span class="section"><a href="#generating-diffs">Generating diffs</a></span></dt><dt><span class="section"><a href="#viewing-old-file-versions">Viewing old file versions</a></span></dt><dt><span class="section"><a href="#history-examples">Examples</a></span></dt></dl></dd><dt><span class="section"><a href="#Developing-With-git">Developing with Git</a></span></dt><dd><dl><dt><span class="section"><a href="#telling-git-your-name">Telling Git your name</a></span></dt><dt><span class="section"><a href="#creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#how-to-make-a-commit">How to make a commit</a></span></dt><dt><span class="section"><a href="#creating-good-commit-messages">Creating good commit messages</a></span></dt><dt><span class="section"><a href="#ignoring-files">Ignoring files</a></span></dt><dt><span class="section"><a href="#how-to-merge">How to merge</a></span></dt><dt><span class="section"><a href="#resolving-a-merge">Resolving a merge</a></span></dt><dt><span class="section"><a href="#undoing-a-merge">Undoing a merge</a></span></dt><dt><span class="section"><a href="#fast-forwards">Fast-forward merges</a></span></dt><dt><span class="section"><a href="#fixing-mistakes">Fixing mistakes</a></span></dt><dt><span class="section"><a href="#ensuring-good-performance">Ensuring good performance</a></span></dt><dt><span class="section"><a href="#ensuring-reliability">Ensuring reliability</a></span></dt></dl></dd><dt><span class="section"><a href="#sharing-development">Sharing development with others</a></span></dt><dd><dl><dt><span class="section"><a href="#getting-updates-With-git-pull">Getting updates with git pull</a></span></dt><dt><span class="section"><a href="#submitting-patches">Submitting patches to a project</a></span></dt><dt><span class="section"><a href="#importing-patches">Importing patches to a project</a></span></dt><dt><span class="section"><a href="#public-repositories">Public Git repositories</a></span></dt><dt><span class="section"><a href="#sharing-development-examples">Examples</a></span></dt></dl></dd><dt><span class="section"><a href="#cleaning-up-history">Rewriting history and maintaining patch series</a></span></dt><dd><dl><dt><span class="section"><a href="#patch-series">Creating the perfect patch series</a></span></dt><dt><span class="section"><a href="#using-git-rebase">Keeping a patch series up to date using git rebase</a></span></dt><dt><span class="section"><a href="#rewriting-one-commit">Rewriting a single commit</a></span></dt><dt><span class="section"><a href="#reordering-patch-series">Reordering or selecting from a patch series</a></span></dt><dt><span class="section"><a href="#interactive-rebase">Using interactive rebases</a></span></dt><dt><span class="section"><a href="#patch-series-tools">Other tools</a></span></dt><dt><span class="section"><a href="#problems-With-rewriting-history">Problems with rewriting history</a></span></dt><dt><span class="section"><a href="#bisect-merges">Why bisecting merge commits can be harder than bisecting linear history</a></span></dt></dl></dd><dt><span class="section"><a href="#advanced-branch-management">Advanced branch management</a></span></dt><dd><dl><dt><span class="section"><a href="#fetching-individual-branches">Fetching individual branches</a></span></dt><dt><span class="section"><a href="#fetch-fast-forwards">git fetch and fast-forwards</a></span></dt><dt><span class="section"><a href="#forcing-fetch">Forcing git fetch to do non-fast-forward updates</a></span></dt><dt><span class="section"><a href="#remote-branch-configuration">Configuring remote-tracking branches</a></span></dt></dl></dd><dt><span class="section"><a href="#git-concepts">Git concepts</a></span></dt><dd><dl><dt><span class="section"><a href="#the-object-database">The Object Database</a></span></dt><dt><span class="section"><a href="#the-index">The index</a></span></dt></dl></dd><dt><span class="section"><a href="#submodules">Submodules</a></span></dt><dd><dl><dt><span class="section"><a href="#_pitfalls_with_submodules">Pitfalls with submodules</a></span></dt></dl></dd><dt><span class="section"><a href="#low-level-operations">Low-level Git operations</a></span></dt><dd><dl><dt><span class="section"><a href="#object-manipulation">Object access and manipulation</a></span></dt><dt><span class="section"><a href="#the-workflow">The Workflow</a></span></dt><dt><span class="section"><a href="#examining-the-data">Examining the data</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees">Merging multiple trees</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees-2">Merging multiple trees, continued</a></span></dt></dl></dd><dt><span class="section"><a href="#hacking-git">Hacking Git</a></span></dt><dd><dl><dt><span class="section"><a href="#object-details">Object storage format</a></span></dt><dt><span class="section"><a href="#birdview-on-the-source-code">A birds-eye view of Git’s source code</a></span></dt></dl></dd><dt><span class="section"><a href="#glossary">Git Glossary</a></span></dt><dt><span class="appendix"><a href="#git-quick-start">A. Git Quick Reference</a></span></dt><dd><dl><dt><span class="section"><a href="#quick-creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#managing-branches">Managing branches</a></span></dt><dt><span class="section"><a href="#exploring-history">Exploring history</a></span></dt><dt><span class="section"><a href="#making-changes">Making changes</a></span></dt><dt><span class="section"><a href="#merging">Merging</a></span></dt><dt><span class="section"><a href="#sharing-your-changes">Sharing your changes</a></span></dt><dt><span class="section"><a href="#repository-maintenance">Repository maintenance</a></span></dt></dl></dd><dt><span class="appendix"><a href="#todo">B. Notes and todo list for this manual</a></span></dt></dl></div><p>Git is a fast distributed revision control system.</p><p>This manual is designed to be readable by someone with basic UNIX command-line skills, but no previous knowledge of Git.</p><p><a class="xref" href="#repositories-and-branches" title="Repositories and Branches">the section called “Repositories and Branches”</a> and <a class="xref" href="#exploring-git-history" title="Exploring Git history">the section called “Exploring Git history”</a> explain how to fetch and study a project using git—read these chapters to learn how to build and test a particular version of a software project, search for @@ -1796,7 +1796,7 @@ came from: stage 1 corresponds to the <code class="literal">$orig</code> tree, stage 2 to the <code class="literal">HEAD</code> tree, and stage 3 to the <code class="literal">$target</code> tree.</p><p>Earlier we said that trivial merges are done inside <code class="literal">git read-tree -m</code>. For example, if the file did not change -from <code class="literal">$orig</code> to <code class="literal">HEAD</code> nor <code class="literal">$target</code>, or if the file changed +from <code class="literal">$orig</code> to <code class="literal">HEAD</code> or <code class="literal">$target</code>, or if the file changed from <code class="literal">$orig</code> to <code class="literal">HEAD</code> and <code class="literal">$orig</code> to <code class="literal">$target</code> the same way, obviously the final outcome is what is in <code class="literal">HEAD</code>. What the above example shows is that file <code class="literal">hello.c</code> was changed from
diff --git a/user-manual.txt b/user-manual.txt index d4f9804..022e74e 100644 --- a/user-manual.txt +++ b/user-manual.txt
@@ -4074,7 +4074,7 @@ Earlier we said that trivial merges are done inside `git read-tree -m`. For example, if the file did not change -from `$orig` to `HEAD` nor `$target`, or if the file changed +from `$orig` to `HEAD` or `$target`, or if the file changed from `$orig` to `HEAD` and `$orig` to `$target` the same way, obviously the final outcome is what is in `HEAD`. What the above example shows is that file `hello.c` was changed from
